From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Tue, 7 Jan 2020 16:58:33 +0000 (+0200)
Subject: build: sort location annotation table in i18n sync process
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=460bdfe814a34ca5300e7a1a57efecff590dd414;p=project%2Fluci.git

build: sort location annotation table in i18n sync process

The scanning routine has caused unnecessary changes to the .po files
if a string has been found in multiple files and those files have been
found in different order than the previous time.

Sort the location annotations to avoid unnecessary changes to the .po files.
(sort is alphabetic, so the line numbers are also sorted alphabetically)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
[apply a Schwartzian transform to sort locations by path, then line number]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/build/i18n-scan.pl b/build/i18n-scan.pl
index 5ac1cb77d4..fc516c6a04 100755
--- a/build/i18n-scan.pl
+++ b/build/i18n-scan.pl
@@ -272,7 +272,11 @@ if( open C, "| msgcat -" )
 	{
 		if( length $key )
 		{
-			my @positions = @{$stringtable{$key}};
+			my @positions =
+				map { join ':', @$_ }
+				sort { ($a->[0] cmp $b->[0]) || ($a->[1] <=> $b->[1]) }
+				map { [ /^(.+):(\d+)$/ ] }
+				@{$stringtable{$key}};
 
 			$key =~ s/\\/\\\\/g;
 			$key =~ s/\n/\\n/g;